diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 86fa332..c630322 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -6,9 +6,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; -import org.springframework.web.multipart.MultipartFile; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 86fa332..c630322 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -6,9 +6,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; -import org.springframework.web.multipart.MultipartFile; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java index 70d391b..80ec612 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 86fa332..c630322 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -6,9 +6,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; -import org.springframework.web.multipart.MultipartFile; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java index 70d391b..80ec612 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java index b329ccd..4d5ffe3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 86fa332..c630322 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -6,9 +6,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; -import org.springframework.web.multipart.MultipartFile; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java index 70d391b..80ec612 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java index b329ccd..4d5ffe3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java index 78f6e9e..c83b68c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.system.SignAddRequest; import com.casic.missiles.dto.system.SignDetailResponse; import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 86fa332..c630322 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -6,9 +6,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; -import org.springframework.web.multipart.MultipartFile; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java index 70d391b..80ec612 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java index b329ccd..4d5ffe3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java index 78f6e9e..c83b68c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.system.SignAddRequest; import com.casic.missiles.dto.system.SignDetailResponse; import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java index 54e4a40..91aa01e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 86fa332..c630322 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -6,9 +6,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; -import org.springframework.web.multipart.MultipartFile; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java index 70d391b..80ec612 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java index b329ccd..4d5ffe3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java index 78f6e9e..c83b68c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.system.SignAddRequest; import com.casic.missiles.dto.system.SignDetailResponse; import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java index 54e4a40..91aa01e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java index 09883b9..01d93bf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.system.TemplateAddRequest; import com.casic.missiles.dto.system.TemplateDetailResponse; import com.casic.missiles.dto.system.TemplateListRequest; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; import java.util.List; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java index 46b25be..15d09ae 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java index 6b743c5..9e8b89e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java @@ -14,7 +14,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterFileService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 1c5809d..88b6416 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterOrganizeService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 7994b9b..94c825b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -10,7 +10,7 @@ import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import com.casic.missiles.service.meter.MeterPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 6082c03..f717e91 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -9,8 +9,8 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java index c5606bc..e56ed95 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java @@ -11,7 +11,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTraceSupplierService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java index 59fc909..a543546 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java @@ -11,8 +11,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.MeterTrainLog; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.service.meter.IMeterTrainPlanService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 2c721e8..1bb8875 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -13,9 +13,9 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemNotice; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemNotice; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.service.system.ISystemSignService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 050e2a2..4808a4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -12,7 +12,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.system.IFlowDefService; import com.casic.missiles.service.system.ISystemFlowFormService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index 2ee2301..0e2ecd2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.enums.AssigneeSetTypeEnum; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java index 9fa7a29..b37dbdb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateExpireMessageMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java index 8106e08..4c32561 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterCertificateMapper.java @@ -6,8 +6,8 @@ import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java index 8a42257..8d70c94 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.FileApprovalListRequest; import com.casic.missiles.dto.meter.FileApprovalListResponse; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java index 7182d2c..9ec1277 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterHistoricalPriceMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index 1286dd1..209962b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java index f183636..3e069ec 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceCategory; public interface MeterPriceCategoryMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java index c19c012..19249e9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterPriceItem; +import com.casic.missiles.model.meter.MeterPriceItem; public interface MeterPriceItemMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 7a15b78..d0ff2d4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index 8b7b2a7..a4f7ba4 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java index 80bdddb..b5cfc4e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest; import com.casic.missiles.dto.meter.TraceSupplierDetailResponse; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java index 7573cb7..88b4f48 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierPersonMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java index 0dccfc6..51181c5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainLogMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainLogDetailResponse; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import org.apache.ibatis.annotations.Param; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java index a3f80ba..9bd6254 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.dto.meter.TrainPlanApprovalListRequest; import com.casic.missiles.dto.meter.TrainPlanDetailResponse; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java index d312966..c4186f7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.meter.TrainStaffExamDTO; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java index 788d7b5..47eaa25 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/UserInfoMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.system.UserInfo; public interface UserInfoMapper extends BaseMapper { } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java index b0086f3..ba7dfe1 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemFlowFormMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java index b37bff0..fa6e8f9 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemNoticeMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 115ef94..db34182 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.SignDetailResponse; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java index 726d5f6..5c68004 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java index b69ee3d..3a31683 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateMapper.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.dto.system.TemplateDetailResponse; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; /** *

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java index 2af3eb9..5a5be15 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemTemplateUserRelationMapper.java @@ -1,7 +1,7 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 505c947..135544e 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -75,7 +75,7 @@ - SELECT t1.id as certificate_id, t1.staff_id, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml index 376057f..758d2f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml @@ -48,7 +48,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 @@ -74,7 +74,7 @@ - SELECT * FROM meter_file WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index eba1516..2765a80 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - SELECT mp.id, mp.price_no, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 668e855..355c002 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -32,7 +32,7 @@ - select t2.* from (SELECT t.id, t.`NAME`, @@ -73,7 +73,7 @@ - SELECT t.id, t.id_card, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml index 77ebaa9..ea7c1cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml @@ -63,7 +63,7 @@ WHERE mts.id = #{id} AND mts.is_del = 0 - SELECT * FROM meter_trace_supplier WHERE is_del = 0 @@ -89,7 +89,7 @@ - SELECT * FROM meter_trace_supplier WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml index f519adc..e1935bd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml @@ -17,7 +17,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml index 1b93ea5..1bc285f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml @@ -17,7 +17,7 @@ - + @@ -61,7 +61,7 @@ DATE_FORMAT( train_time, '%Y-%m' ) - SELECT * FROM meter_train_plan WHERE is_del = 0 @@ -84,7 +84,7 @@ - SELECT * FROM meter_train_plan WHERE is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml index 467cde0..bd0ab84 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemFlowFormMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml index 5e9cf6e..59119f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemNoticeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index bdc79d2..0183a33 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index cdff165..63bca23 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml index 8cf8dbb..0167150 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateUserRelationMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java index 9512220..01514ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java index 2f01892..7a7a52b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanDetailResponse.java @@ -1,6 +1,6 @@ package com.casic.missiles.dto.meter; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java deleted file mode 100644 index 32e7ec0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate") -public class MeterCertificate implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "Long") - private String staffId; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("certificate_date") - @ApiModelProperty(value = "发证日期", dataType = "String") - private String certificateDate; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("certificate_status") - @ApiModelProperty(value = "证书状况", dataType = "String") - private String certificateStatus; - - @TableField("minio_file_name") - @ApiModelProperty(value = "minio存储文件名", dataType = "String") - private String minioFileName; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "人员信息", dataType = "Object") - @TableField(exist = false) - private MeterStaff meterStaff; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java deleted file mode 100644 index 2a941c0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificateExpireMessage.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_certificate_expire_message") -public class MeterCertificateExpireMessage implements Serializable { - - private static final long serialVersionUID = 2822661594481576499L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("staff_id") - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; - - @TableField("certificate_id") - @ApiModelProperty(value = "证书表id", dataType = "String") - private String certificateId; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") - private String staffNo; - - @TableField("certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - private String certificateNo; - - @TableField("certificate_name") - @ApiModelProperty(value = "证书名称", dataType = "String") - private String certificateName; - - @TableField("valid_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - private String validDate; - - @TableField("status") - @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") - private Integer status; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { - this.id = id; - this.staffId = staffId; - this.certificateId = certificateId; - this.staffNo = staffNo; - this.certificateNo = certificateNo; - this.certificateName = certificateName; - this.validDate = validDate; - this.status = status; - } - - public MeterCertificateExpireMessage() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java deleted file mode 100644 index 32da756..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFile.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-计量文件-文件表 - *

- * - * @author wangpeng - * @since 2022-11-22 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_file") -public class MeterFile implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") - private Long id; - - /** - * 文件编号-系统生成 - */ - @ExcelProperty("文件编号") - @TableField("file_no") - @ApiModelProperty(value = "文件编号", dataType = "String") - private String fileNo; - - /** - * 文件名称 - */ - @ExcelProperty("文件名称") - @ApiModelProperty(value = "文件名称", dataType = "String") - @TableField("file_name") - private String fileName; - - /** - * 文件号 - */ - @ExcelProperty("文件号") - @ApiModelProperty(value = "文件号", dataType = "String", required = true) - @NotBlank(message = "文件号不能为空") - @TableField("file_code") - private String fileCode; - - /** - * 文件类别-字典code - */ - @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) - @NotBlank(message = "文件类别不能为空") - @TableField("file_type") - private String fileType; - - @ExcelProperty("文件类别") - @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String fileTypeName; - - /** - * 发布时间 - */ - @ExcelProperty("发布时间") - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("publish_time") - private String publishTime; - - /** - * 发布单位-存名字 - */ - @ExcelProperty("发布单位") - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("publisher") - private String publisher; - - /** - * 实施时间 - */ - @ExcelProperty("实施时间") - @ApiModelProperty(value = "实施时间", dataType = "String") - @TableField("effective_time") - private String effectiveTime; - - /** - * 实施状态-字典code - */ - @ApiModelProperty(value = "实施状态", dataType = "String") - @TableField("effective_status") - private String effectiveStatus; - - @ExcelProperty("实施状态") - @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") - @TableField(exist = false) - private String effectiveStatusName; - - /** - * 创建人 - */ - @ExcelProperty("创建人") - @ApiModelProperty(value = "创建人", dataType = "String") - @TableField("create_user") - private String createUser; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * minio存储文件名 - */ - @ExcelProperty("存储文件名") - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @JsonIgnore - @TableField(exist = false) - private List ids; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java deleted file mode 100644 index 650ac7f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterHistoricalPrice.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("meter_historical_price") -public class MeterHistoricalPrice implements Serializable { - - private static final long serialVersionUID = -4893738018909956246L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_id") - @ApiModelProperty(value = "价格表id", dataType = "String") - private String priceId; - - @TableField("price_no") - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price") - @ApiModelProperty(value = "定价", dataType = "Double") - private Double price; - - @TableField("enable_time") - @ApiModelProperty(value = "启用时间", dataType = "String") - private String enableTime; - - @TableField("end_time") - @ApiModelProperty(value = "结束时间", dataType = "String") - private String endTime; - - @TableField("update_staff") - @ApiModelProperty(value = "修改人员", dataType = "String") - private String updateStaff; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java deleted file mode 100644 index 3aff773..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 计量管理-计量组织-部门管理/科室管理/工程组管理 - *

- * - * @author wangpeng - * @since 2022-11-27 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_organize") -public class MeterOrganize implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - private Long id; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotNull(message = "系统组织部门id不能为空") - @TableField("dept_id") - private Long deptId; - - /** - * 父组织部门id - */ - @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) - @TableField("p_dept_id") - private Long pDeptId; - - @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) - @TableField(exist = false) - private String pDeptName; - - /** - * 部门/科室/工程组编号 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(hidden = true) - @TableField("organize_no") - private String organizeNo; - - /** - * 部门/科室/工程组名称 - */ - @ExcelProperty("组织编号") - @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) - @NotBlank(message = "计量组织名称不能为空") - @TableField("organize_name") - private String organizeName; - - /** - * 组织类型-对标dept_type - */ - @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) - @NotBlank(message = "计量组织类型不能为空") - @TableField("organize_type") - private String organizeType; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /** - * 计量专业 - */ - @ExcelProperty("专业") - @ApiModelProperty(value = "计量专业", dataType = "String") - @TableField("meter_major") - private String meterMajor; - - /** - * 技术职务-字典code - */ - @ApiModelProperty(value = "技术职务字典code", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - @ExcelProperty("技术职务") - @ApiModelProperty(value = "技术职务字典value", dataType = "String") - @TableField(exist = false) - private String technologyJobName; - - /** - * 行政职务-字典code - */ - @ApiModelProperty(value = "行政职务字典code", dataType = "String") - @TableField("administration_job") - private String administrationJob; - - @ExcelProperty("行政职务") - @ApiModelProperty(value = "行政职务字典value", dataType = "String") - @TableField(exist = false) - private String administrationJobName; - - /** - * 联系方式 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java deleted file mode 100644 index 1d5145f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.casic.missiles.model; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_price") -public class MeterPrice implements Serializable { - - private static final long serialVersionUID = 3882143045642737113L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("price_no") - @ExcelProperty(value = "价格编号",order = 0) - @ApiModelProperty(value = "价格编号", dataType = "String") - private String priceNo; - - @TableField("price_name") - @ExcelProperty(value = "价格名称",order = 1) - @ApiModelProperty(value = "价格名称", dataType = "String") - private String priceName; - - @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) - @ApiModelProperty(value = "校验类型-字典value", dataType = "String") - private String checkType; - - @TableField("price_type") - @ApiModelProperty(value = "类别id", dataType = "String") - private String priceType; - - @TableField(exist = false) - @ExcelProperty(value = "类别",order = 4) - @ApiModelProperty(value = "类别名称", dataType = "String") - private String categoryName; - - @TableField("price_item") - @ApiModelProperty(value = "项目id", dataType = "String") - private String priceItem; - - @TableField(exist = false) - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目名称", dataType = "String") - private String itemName; - - @TableField("price_standard") - @ExcelProperty(value = "依据标准",order = 9) - @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") - private String priceStandard; - - @TableField("price_limit") - @ApiModelProperty(value = "限制范围", dataType = "String") - private String priceLimit; - - @TableField("price_description") - @ApiModelProperty(value = "说明", dataType = "String") - private String priceDescription; - - @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) - @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") - private String operatorDiscountPermission; - - @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) - @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") - private String directorDiscountPermission; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("model") - @ExcelProperty(value = "型号",order = 3) - @ApiModelProperty(value = "型号", dataType = "String") - private String model; - - @TableField("price") - @ExcelProperty(value = "标准价格(元)",order = 6) - @ApiModelProperty(value = "标准价格(元)", dataType = "Double") - private Double price; - - @TableField("create_time") - @ExcelProperty(value = "创建时间",order = 10) - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "历史价格列表", dataType = "List") - @TableField(exist = false) - private List historicalPriceList; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java deleted file mode 100644 index d05557b..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_category") -public class MeterPriceCategory implements Serializable { - - private static final long serialVersionUID = 3734458833527172572L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 校验类型-字典code - */ - @TableField("check_type_code") - @ApiModelProperty(value = "校验类型-字典code", dataType = "String") - private String checkTypeCode; - - /** - * 类别名称 - */ - @ApiModelProperty(value = "类别名称", dataType = "String") - @TableField("category_name") - private String categoryName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { - this.id = id; - this.checkTypeCode = checkTypeCode; - this.categoryName = categoryName; - } - - public MeterPriceCategory() { - } -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java deleted file mode 100644 index e59ff2f..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel -@TableName("meter_price_item") -public class MeterPriceItem implements Serializable { - - private static final long serialVersionUID = 8885247047683107748L; - /** - * 主键 - */ - @TableId("id") - @ApiModelProperty(value = "主键", dataType = "Long") - private Long id; - - /** - * 类别id - */ - @TableField("category_id") - @ApiModelProperty(value = "类别id", dataType = "String") - private Long categoryId; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称", dataType = "String") - @TableField("item_name") - private String itemName; - - /** - * 备注 - */ - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String", required = false) - private String remark; - - /** - * 删除标记 - */ - @TableField("is_del") - private Integer isDel; - - /** - * 创建人 - */ - @TableField("create_user") - private Long createUser; - - /** - * 创建时间 - */ - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private String updateTime; - - public MeterPriceItem(Long id,Long categoryId, String itemName) { - this.id = id; - this.categoryId = categoryId; - this.itemName = itemName; - } - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java deleted file mode 100644 index 22d44ac..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@TableName("meter_staff") -public class MeterStaff implements Serializable { - - private static final long serialVersionUID = 8221643116858985801L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - @ExcelProperty(value = "姓名",order = 1) - private String name; - - @TableField("minio_file_name") - @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") - private String minioFileName; - - @TableField("id_card") - @ApiModelProperty(value = "身份证号", dataType = "String") - private String idCard; - - @TableField("staff_no") - @ApiModelProperty(value = "人员编号", dataType = "String") - @ExcelProperty(value = "人员编号",order = 0) - private String staffNo; - - @TableField("account") - @ApiModelProperty(value = "登录账号", dataType = "String") - private String account; - - @TableField("sex") - @ApiModelProperty(value = "性别", dataType = "String") - @ExcelProperty(value = "性别",order = 3) - private String sex; - - @TableField("birthday") - @ApiModelProperty(value = "生日", dataType = "String") - private String birthday; - - @TableField("education") - @ApiModelProperty(value = "文化程度", dataType = "String") - @ExcelProperty(value = "学历",order = 2) - private String education; - - @TableField("technology_job") - @ApiModelProperty(value = "技术职位", dataType = "String") - @ExcelProperty(value = "技术职位",order = 5) - private String technologyJob; - - @TableField("administration_job") - @ApiModelProperty(value = "行政职务", dataType = "String") - @ExcelProperty(value = "行政职务",order = 6) - private String administrationJob; - - @TableField("dept_id") - @ApiModelProperty(value = "组织部门", dataType = "String") - @ExcelProperty(value = "工作部门",order = 4) - private String deptId; - - @TableField("major") - @ApiModelProperty(value = "专业", dataType = "String") - @ExcelProperty(value = "计量专业",order = 7) - private String major; - - @TableField("certificate_company") - @ApiModelProperty(value = "发证单位", dataType = "String") - private String certificateCompany; - - @TableField("verifier_certificate_no") - @ApiModelProperty(value = "证书号", dataType = "String") - @ExcelProperty(value = "证书号",order = 8) - private String verifierCertificateNo; - - @TableField("certificate_date") - @ApiModelProperty(value = "有效日期", dataType = "String") - @ExcelProperty(value = "证书有效日期",order = 9) - private String certificateDate; - - @TableField("work_date") - @ApiModelProperty(value = "从事日期", dataType = "String") - private String workDate; - - @TableField("technology_exam") - @ApiModelProperty(value = "技术考核", dataType = "String") - @ExcelProperty(value = "技术考核",order = 10) - private String technologyExam; - - @TableField(value = "main_examiner") - @ApiModelProperty(value = "是否主考人", dataType = "String") - private String mainExaminer; - - @TableField(value = "special_operator") - @ApiModelProperty(value = "是否特操人", dataType = "String") - private String specialOperator; - - @TableField("remark") - @ApiModelProperty(value = "备注", dataType = "String") - private String remark; - - @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "Integer") - private Integer isDel; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间", dataType = "String") - private String createTime; - - @TableField("update_time") - @ApiModelProperty(value = "更新时间", dataType = "String") - private String updateTime; - - @ApiModelProperty(value = "证书列表", dataType = "List") - @TableField(exist = false) - private List certificateList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java deleted file mode 100644 index 79109f0..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_trace_supplier") -public class MeterTraceSupplier implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - private Long id; - - /** - * 溯源供方编号 - */ - @ExcelProperty("溯源供方编号") - @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") - @TableField("supplier_no") - private String supplierNo; - - /** - * 公司名称 - */ - @ExcelProperty("溯源供方名称") - @ApiModelProperty(value = "公司名称", dataType = "String", required = true) - @NotBlank(message = "公司名称不能为空") - @TableField("supplier_name") - private String supplierName; - - /** - * 公司简称 - */ - @ApiModelProperty(value = "公司简称", dataType = "String") - @TableField("brief_name") - private String briefName; - - /** - * 业务内容 - */ - @ExcelProperty("业务内容") - @ApiModelProperty(value = "业务内容", dataType = "String", required = true) - @NotBlank(message = "业务内容不能为空") - @TableField("business_content") - private String businessContent; - - /** - * 税号 - */ - @ApiModelProperty(value = "税号", dataType = "String") - @TableField("tax_number") - private String taxNumber; - - /** - * 银行账户名 - */ - @ApiModelProperty(value = "银行账户名", dataType = "String") - @TableField("bank_account") - private String bankAccount; - - /** - * 银行名称 - */ - @ApiModelProperty(value = "银行名称", dataType = "String") - @TableField("bank_name") - private String bankName; - - /** - * 银行账号 - */ - @ApiModelProperty(value = "银行账号", dataType = "String") - @TableField("bank_account_number") - private String bankAccountNumber; - - /** - * 邮编 - */ - @ApiModelProperty(value = "邮编", dataType = "String") - @TableField("postal_code") - private String postalCode; - - /** - * 负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人", dataType = "String") - @TableField("director") - private String director; - - /**发布人 - * 电话 - */ - @ExcelProperty("联系方式") - @ApiModelProperty(value = "电话", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 传真 - */ - @ApiModelProperty(value = "传真", dataType = "String") - @TableField("fax") - private String fax; - - /** - * 手机 - */ - @ApiModelProperty(value = "手机", dataType = "String") - @TableField("mobile") - private String mobile; - - /** - * 邮箱 - */ - @ApiModelProperty(value = "邮箱", dataType = "String") - @TableField("mailbox") - private String mailbox; - - /** - * 网址 - */ - @ApiModelProperty(value = "网址", dataType = "String") - @TableField("website") - private String website; - - /** - * 公司地址-国家 - */ - @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") - @TableField("company_country") - private String companyCountry; - - @ExcelProperty("公司地址-国家") - @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") - @TableField("company_country_name") - private String companyCountryName; - - /** - * 公司地址-省 - */ - @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") - @TableField("company_province") - private String companyProvince; - - @ExcelProperty("公司地址-省") - @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") - @TableField("company_province_name") - private String companyProvinceName; - - /** - * 公司地址-市 - */ - @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") - @TableField("company_city") - private String companyCity; - - @ExcelProperty("公司地址-市") - @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") - @TableField("company_city_name") - private String companyCityName; - - /** - * 公司地址-区 - */ - @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") - @TableField("company_area") - private String companyArea; - - @ExcelProperty("公司地址-区") - @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") - @TableField("company_area_name") - private String companyAreaName; - - /** - * 公司地址-详细地址 - */ - @ExcelProperty("公司地址-详细地址") - @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") - @TableField("company_address") - private String companyAddress; - - /** - * 开票地址-国家 - */ - @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") - @TableField("invoice_country") - private String invoiceCountry; - - @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") - @TableField("invoice_country_name") - private String invoiceCountryName; - - /** - * 开票地址-省 - */ - @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province") - private String invoiceProvince; - - @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province_name") - private String invoiceProvinceName; - - /** - * 开票地址-市 - */ - @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") - @TableField("invoice_city") - private String invoiceCity; - - @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") - @TableField("invoice_city_name") - private String invoiceCityName; - - /** - * 开票地址-区 - */ - @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") - @TableField("invoice_area") - private String invoiceArea; - - @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") - @TableField("invoice_area_name") - private String invoiceAreaName; - - /** - * 开票地址-详细地址 - */ - @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") - @TableField("invoice_address") - private String invoiceAddress; - - /** - * 公司业务范围 - */ - @ApiModelProperty(value = "公司业务范围", dataType = "String") - @TableField("business_scope") - private String businessScope; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - /** - * 流程实例id - */ - @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 - */ - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @TableField(exist = false) - private List traceSupplierPersonList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java deleted file mode 100644 index f7ae22a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-溯源供方-溯源供方人员表 - *

- * - * @author wangpeng - * @since 2022-11-28 - */ -@ApiModel -@Data -@TableName("meter_trace_supplier_person") -public class MeterTraceSupplierPerson implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 溯源供方表id - */ - @ApiModelProperty(hidden = true) - @TableField("supplier_id") - private Long supplierId; - - /** - * 人员编号 - */ - @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") - @TableField("person_no") - private String personNo; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", dataType = "String") - @TableField("name") - private String name; - - /** - * 部门 - */ - @ApiModelProperty(value = "部门", dataType = "String") - @TableField("department") - private String department; - - /** - * 职务 - */ - @ApiModelProperty(value = "职务", dataType = "String") - @TableField("job") - private String job; - - /** - * 联系方式 - */ - @ApiModelProperty(value = "联系方式", dataType = "String") - @TableField("phone") - private String phone; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java deleted file mode 100644 index ec10759..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训计录表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_log") -public class MeterTrainLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id", dataType = "Long") - private Long id; - - /** - * 培训计录编号 - */ - @ExcelProperty("记录编号") - @ApiModelProperty(value = "培训计录编号", dataType = "String") - @TableField("log_no") - private String logNo; - - /** - * 培训名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "记录名称", dataType = "String") - @TableField("train_name") - private String trainName; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - - /** - * 填表人 - */ - @ApiModelProperty(value = "填表人", dataType = "String") - @TableField("preparer") - private String preparer; - - /** - * 培训计划表id - */ - @ApiModelProperty(value = "培训计划表id", dataType = "Long") - @TableField("plan_id") - private Long planId; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "String") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训内容 - */ - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 培训效果 - */ - @ApiModelProperty(value = "培训效果", dataType = "String") - @TableField("train_effect") - private String trainEffect; - - /** - * 存在问题 - */ - @ApiModelProperty(value = "存在问题", dataType = "String") - @TableField("problems") - private String problems; - - /** - * 改进措施 - */ - @ApiModelProperty(value = "改进措施", dataType = "String") - @TableField("improve_method") - private String improveMethod; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java deleted file mode 100644 index 012cf43..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 计量管理-培训管理-培训计划表 - *

- * - * @author wangpeng - * @since 2022-11-23 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("meter_train_plan") -public class MeterTrainPlan implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) - private Long id; - - /** - * 培训计划编号 - */ - @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") - @TableField("plan_no") - private String planNo; - - /** - * 培训计划名称 - */ - @ExcelProperty("培训名称") - @ApiModelProperty(value = "培训名称", dataType = "String", required = true) - @NotBlank(message = "培训名称不能为空") - @TableField("plan_name") - private String planName; - - /** - * 培训对象 - */ - @ExcelProperty("培训对象") - @ApiModelProperty(value = "培训对象", dataType = "String", required = true) - @NotBlank(message = "培训对象不能为空") - @TableField("train_person") - private String trainPerson; - - /** - * 培训人数 - */ - @ExcelProperty("培训人数") - @ApiModelProperty(value = "培训人数", dataType = "Integer") - @TableField("train_number") - private Integer trainNumber; - - /** - * 培训时间 - */ - @ExcelProperty("培训时间") - @ApiModelProperty(value = "培训时间", dataType = "String") - @TableField("train_time") - private String trainTime; - - /** - * 培训学时 - */ - @ExcelProperty("培训学时") - @ApiModelProperty(value = "培训学时", dataType = "String") - @TableField("train_hour") - private String trainHour; - - /** - * 组织部门id-系统组织表 - */ - @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") - @TableField("dept_id") - private Long deptId; - - @ExcelProperty("主管部门") - @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") - @TableField(exist = false) - private String deptName; - - /** - * 实施单位-手填 - */ - @ExcelProperty("实施单位") - @ApiModelProperty(value = "实施单位-手填", dataType = "String") - @TableField("effective_company") - private String effectiveCompany; - - /** - * 负责人-人员名字 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "负责人-人员名字", dataType = "String") - @TableField("director") - private String director; - - /** - * 培训地点 - */ - @ExcelProperty("培训地点") - @ApiModelProperty(value = "培训地点", dataType = "String") - @TableField("train_address") - private String trainAddress; - - /** - * 培训内容 - */ - @ExcelProperty("培训内容") - @ApiModelProperty(value = "培训内容", dataType = "String") - @TableField("train_content") - private String trainContent; - - /** - * 备注 - */ - @ExcelProperty("备注") - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 流程定义id - */ - @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") - @TableField("process_id") - private String processId; - - /** - * 审批状态-字典code - */ - @ApiModelProperty(hidden = true) - @TableField("approval_status") - private String approvalStatus; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private String approvalStatusName; - - @ApiModelProperty(hidden = true) - @TableField("create_user_id") - private Long createUserId; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @NotEmpty(message = "培训人员不能为空") - @ApiModelProperty(value = "培训人员", dataType = "List") - @TableField(exist = false) - private List trainStaffList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java deleted file mode 100644 index d96588a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 计量管理-培训管理-培训人员表 - *

- * - * @author wangpeng - * @since 2022-11-26 - */ -@ApiModel -@Data -@TableName("meter_train_staff") -public class MeterTrainStaff implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") - @TableId("id") - private Long id; - - /** - * 计量人员表id - */ - @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) - @TableField("staff_id") - private Long staffId; - - /** - * 培训计划表id - */ - @ApiModelProperty(hidden = true) - @TableField("plan_id") - private Long planId; - - /** - * 学员名称 - */ - @ApiModelProperty(value = "学员名称", dataType = "String", required = true) - @TableField("name") - private String name; - - /** - * 单位名称-存文字 - */ - @ApiModelProperty(value = "单位名称-存文字", dataType = "String") - @TableField("company") - private String company; - - /** - * 技术职称-存文字 - */ - @ApiModelProperty(value = "技术职称-存文字", dataType = "String") - @TableField("technology_job") - private String technologyJob; - - /** - * 签到时间 - */ - @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") - @TableField("sign_time") - private String signTime; - - /** - * 考核结果-存文字 - */ - @ApiModelProperty(value = "考核结果-存文字", dataType = "String") - @TableField("exam_result") - private String examResult; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注", dataType = "String") - @TableField("remark") - private String remark; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java deleted file mode 100644 index 24a9801..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemFlowForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 流程定义表单表 - * 表单和流程定义为多对一关系 - * @author wangpeng - * @since 2022-12-12 - */ -@Data -@TableName("system_flow_form") -public class SystemFlowForm implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 表单id - */ - @TableField("form_id") - private String formId; - - /** - * 流程定义部署表主键 - */ - @TableField("deploy_id") - private String deployId; - - /** - * 流程定义表主键 - */ - @TableField("pro_def_id") - private String procDefId; - - /** - * 表单名称 - */ - @TableField("form_name") - private String formName; - - /** - * 表单内容 - */ - @TableField("form_content") - private String formContent; - - /** - * 流程定义json - */ - @TableField("flow_def") - private String flowDef; - - /** - * 表单描述/流程定义描述 - */ - @TableField("form_desc") - private String formDesc; - - @TableField("is_del") - private Integer isDel; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java deleted file mode 100644 index 8a365be..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemNotice.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - *

- * 系统管理-通知公告表 - *

- * - * @author wangpeng - * @since 2022-11-29 - */ -@ApiModel -@Data -@TableName("system_notice") -public class SystemNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 通知公告编号 - */ - @ApiModelProperty(value = "通知公告编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("notice_no") - private String noticeNo; - - /** - * 通知公告标题 - */ - @ApiModelProperty(value = "通知公告标题", dataType = "String") - @NotBlank(message = "标题不能为空") - @TableField("notice_title") - private String noticeTitle; - - /** - * 发布人 - */ - @ApiModelProperty(value = "发布人", dataType = "String") - @NotBlank(message = "发布人不能为空") - @TableField("notice_publisher") - private String noticePublisher; - - /** - * 发布单位 - */ - @ApiModelProperty(value = "发布单位", dataType = "String") - @TableField("notice_company") - private String noticeCompany; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间", dataType = "String") - @TableField("notice_time") - private String noticeTime; - - /** - * 内容简述 - */ - @ApiModelProperty(value = "内容简述", dataType = "String") - @TableField("notice_sketch") - private String noticeSketch; - - /** - * 发布内容 - */ - @ApiModelProperty(value = "发布内容", dataType = "String") - @NotBlank(message = "发布内容不能为空") - @TableField("notice_content") - private String noticeContent; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回名称", dataType = "String") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ApiModelProperty(hidden = true) - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java deleted file mode 100644 index 694a8b9..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSign.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-签章/签名管理表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_sign") -public class SystemSign implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 签章/签名编号 - */ - @ExcelProperty("编号") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("sign_no") - private String signNo; - - /** - * 签章/签名名称 - */ - @ExcelProperty("名称") - @ApiModelProperty(value = "签章/签名编号", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("sign_name") - private String signName; - - /** - * 签章/签名描述 - */ - @ExcelProperty("描述") - @ApiModelProperty(value = "签章/签名描述", dataType = "String") - @TableField("sign_desc") - private String signDesc; - - /** - * 签章/签名负责人 - */ - @ExcelProperty("负责人") - @ApiModelProperty(value = "签章/签名负责人", dataType = "String") - @NotBlank(message = "负责人不能为空") - @TableField("sign_director") - private String signDirector; - - /** - * 签章或签名-字典code - */ - @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("sign_type") - private String signType; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java deleted file mode 100644 index bde1139..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemSignUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 签章/签名与用户关联表(签章/签名可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_sign_user_relation") -public class SystemSignUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 签章/签名表id - */ - @TableField("sign_id") - private Long signId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java deleted file mode 100644 index 95ee980..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplate.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.model; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.alibaba.excel.enums.poi.BorderStyleEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - *

- * 系统管理-常用工具-原始记录模板/证书报告模板表 - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) -@ExcelIgnoreUnannotated -@ApiModel -@Data -@TableName("system_template") -public class SystemTemplate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id", dataType = "Long", required = true) - @NotNull(message = "主键id不能为空") - @TableId("id") - private Long id; - - /** - * 模板编号 - */ - @ExcelProperty("模板编号") - @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") - @NotBlank(message = "编号不能为空") - @TableField("template_no") - private String templateNo; - - /** - * 模板名称 - */ - @ExcelProperty("模板名称") - @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") - @NotBlank(message = "名称不能为空") - @TableField("template_name") - private String templateName; - - /** - * 原始记录模板或证书报告模板-字典code - */ - @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") - @NotBlank(message = "类型不能为空") - @TableField("template_type") - private String templateType; - - /** - * 模板描述 - */ - @ExcelProperty("模板描述") - @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") - @TableField("template_desc") - private String templateDesc; - - /** - * 模板创建人 - */ - @ExcelProperty("模板创建人") - @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") - @NotBlank(message = "创建人不能为空") - @TableField("template_creator") - private String templateCreator; - - /** - * minio存储文件名 - */ - @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") - @NotBlank(message = "文件不能为空") - @TableField("minio_file_name") - private String minioFileName; - - /** - * 删除标记 - */ - @ApiModelProperty(hidden = true) - @TableField("is_del") - private Integer isDel; - - /** - * 创建时间 - */ - @ExcelProperty("创建时间") - @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") - @TableField("create_time") - private String createTime; - - /** - * 更新时间 - */ - @ApiModelProperty(hidden = true) - @TableField("update_time") - private String updateTime; - - @ApiModelProperty(hidden = true) - @NotEmpty(message = "可使用人不能为空") - @TableField(exist = false) - private List userIdList; -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java deleted file mode 100644 index b92b1ff..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/SystemTemplateUserRelation.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.casic.missiles.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) - *

- * - * @author wangpeng - * @since 2022-12-01 - */ -@Data -@TableName("system_template_user_relation") -public class SystemTemplateUserRelation implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - /** - * 原始记录/证书报告模板表id - */ - @TableField("template_id") - private Long templateId; - - /** - * 系统用户表id - */ - @TableField("user_id") - private Long userId; - - @TableField("create_time") - private String createTime; - - @TableField("update_time") - private String updateTime; - - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java deleted file mode 100644 index 92a2c6a..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/UserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.model; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user") -public class UserInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId("id") - private Long id; - - @TableField("dept_id") - @ApiModelProperty(value = "部门id", dataType = "String") - private String deptId; - - @TableField(exist = false) - @ApiModelProperty(value = "部门名称", dataType = "String") - private String deptName; - - @TableField("name") - @ApiModelProperty(value = "姓名", dataType = "String") - private String name; - - @TableField("account") - @ApiModelProperty(value = "账户", dataType = "String") - private String account; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java new file mode 100644 index 0000000..f86034a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificate.java @@ -0,0 +1,75 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate") +public class MeterCertificate implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "Long") + private String staffId; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("certificate_date") + @ApiModelProperty(value = "发证日期", dataType = "String") + private String certificateDate; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("certificate_status") + @ApiModelProperty(value = "证书状况", dataType = "String") + private String certificateStatus; + + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "人员信息", dataType = "Object") + @TableField(exist = false) + private MeterStaff meterStaff; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java new file mode 100644 index 0000000..c060837 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterCertificateExpireMessage.java @@ -0,0 +1,71 @@ +package com.casic.missiles.model.meter; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_certificate_expire_message") +public class MeterCertificateExpireMessage implements Serializable { + + private static final long serialVersionUID = 2822661594481576499L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("staff_id") + @ApiModelProperty(value = "计量人员表id", dataType = "String") + private String staffId; + + @TableField("certificate_id") + @ApiModelProperty(value = "证书表id", dataType = "String") + private String certificateId; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号（登录账号）", dataType = "String") + private String staffNo; + + @TableField("certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + private String certificateNo; + + @TableField("certificate_name") + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + @TableField("valid_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + private String validDate; + + @TableField("status") + @ApiModelProperty(value = "1已读,0未读", dataType = "Integer") + private Integer status; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + public MeterCertificateExpireMessage(Long id, String staffId, String certificateId, String staffNo, String certificateNo, String certificateName, String validDate, Integer status) { + this.id = id; + this.staffId = staffId; + this.certificateId = certificateId; + this.staffNo = staffNo; + this.certificateNo = certificateNo; + this.certificateName = certificateName; + this.validDate = validDate; + this.status = status; + } + + public MeterCertificateExpireMessage() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java new file mode 100644 index 0000000..16ba85d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -0,0 +1,195 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-计量文件-文件表 + *

+ * + * @author wangpeng + * @since 2022-11-22 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_file") +public class MeterFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表接口返回参数）", dataType = "Long") + private Long id; + + /** + * 文件编号-系统生成 + */ + @ExcelProperty("文件编号") + @TableField("file_no") + @ApiModelProperty(value = "文件编号", dataType = "String") + private String fileNo; + + /** + * 文件名称 + */ + @ExcelProperty("文件名称") + @ApiModelProperty(value = "文件名称", dataType = "String") + @TableField("file_name") + private String fileName; + + /** + * 文件号 + */ + @ExcelProperty("文件号") + @ApiModelProperty(value = "文件号", dataType = "String", required = true) + @NotBlank(message = "文件号不能为空") + @TableField("file_code") + private String fileCode; + + /** + * 文件类别-字典code + */ + @ApiModelProperty(value = "文件类别字典code", dataType = "String", required = true) + @NotBlank(message = "文件类别不能为空") + @TableField("file_type") + private String fileType; + + @ExcelProperty("文件类别") + @ApiModelProperty(value = "文件类别字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String fileTypeName; + + /** + * 发布时间 + */ + @ExcelProperty("发布时间") + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("publish_time") + private String publishTime; + + /** + * 发布单位-存名字 + */ + @ExcelProperty("发布单位") + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("publisher") + private String publisher; + + /** + * 实施时间 + */ + @ExcelProperty("实施时间") + @ApiModelProperty(value = "实施时间", dataType = "String") + @TableField("effective_time") + private String effectiveTime; + + /** + * 实施状态-字典code + */ + @ApiModelProperty(value = "实施状态", dataType = "String") + @TableField("effective_status") + private String effectiveStatus; + + @ExcelProperty("实施状态") + @ApiModelProperty(value = "实施状态字典value（列表接口返回参数）", dataType = "String") + @TableField(exist = false) + private String effectiveStatusName; + + /** + * 创建人 + */ + @ExcelProperty("创建人") + @ApiModelProperty(value = "创建人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + * 可与创建人不同，表示代他人申请，其他人可为非系统中用户 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * minio存储文件名 + */ + @ExcelProperty("存储文件名") + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @JsonIgnore + @TableField(exist = false) + private List ids; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java new file mode 100644 index 0000000..28a3569 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterHistoricalPrice.java @@ -0,0 +1,53 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("meter_historical_price") +public class MeterHistoricalPrice implements Serializable { + + private static final long serialVersionUID = -4893738018909956246L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_id") + @ApiModelProperty(value = "价格表id", dataType = "String") + private String priceId; + + @TableField("price_no") + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price") + @ApiModelProperty(value = "定价", dataType = "Double") + private Double price; + + @TableField("enable_time") + @ApiModelProperty(value = "启用时间", dataType = "String") + private String enableTime; + + @TableField("end_time") + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @TableField("update_staff") + @ApiModelProperty(value = "修改人员", dataType = "String") + private String updateStaff; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java new file mode 100644 index 0000000..5cd5d1e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -0,0 +1,167 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 计量管理-计量组织-部门管理/科室管理/工程组管理 + *

+ * + * @author wangpeng + * @since 2022-11-27 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_organize") +public class MeterOrganize implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) + @NotNull(message = "系统组织部门id不能为空") + @TableField("dept_id") + private Long deptId; + + /** + * 父组织部门id + */ + @ApiModelProperty(value = "父组织id", dataType = "Long", required = true) + @TableField("p_dept_id") + private Long pDeptId; + + @ApiModelProperty(value = "父组织名称", dataType = "String", required = true) + @TableField(exist = false) + private String pDeptName; + + /** + * 部门/科室/工程组编号 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(hidden = true) + @TableField("organize_no") + private String organizeNo; + + /** + * 部门/科室/工程组名称 + */ + @ExcelProperty("组织编号") + @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) + @NotBlank(message = "计量组织名称不能为空") + @TableField("organize_name") + private String organizeName; + + /** + * 组织类型-对标dept_type + */ + @ApiModelProperty(value = "计量组织类型", dataType = "String", required = true) + @NotBlank(message = "计量组织类型不能为空") + @TableField("organize_type") + private String organizeType; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /** + * 计量专业 + */ + @ExcelProperty("专业") + @ApiModelProperty(value = "计量专业", dataType = "String") + @TableField("meter_major") + private String meterMajor; + + /** + * 技术职务-字典code + */ + @ApiModelProperty(value = "技术职务字典code", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + @ExcelProperty("技术职务") + @ApiModelProperty(value = "技术职务字典value", dataType = "String") + @TableField(exist = false) + private String technologyJobName; + + /** + * 行政职务-字典code + */ + @ApiModelProperty(value = "行政职务字典code", dataType = "String") + @TableField("administration_job") + private String administrationJob; + + @ExcelProperty("行政职务") + @ApiModelProperty(value = "行政职务字典value", dataType = "String") + @TableField(exist = false) + private String administrationJobName; + + /** + * 联系方式 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java new file mode 100644 index 0000000..709012d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -0,0 +1,123 @@ +package com.casic.missiles.model.meter; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_price") +public class MeterPrice implements Serializable { + + private static final long serialVersionUID = 3882143045642737113L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("price_no") + @ExcelProperty(value = "价格编号",order = 0) + @ApiModelProperty(value = "价格编号", dataType = "String") + private String priceNo; + + @TableField("price_name") + @ExcelProperty(value = "价格名称",order = 1) + @ApiModelProperty(value = "价格名称", dataType = "String") + private String priceName; + + @TableField("check_type") + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型-字典value", dataType = "String") + private String checkType; + + @TableField("price_type") + @ApiModelProperty(value = "类别id", dataType = "String") + private String priceType; + + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + + @TableField("price_item") + @ApiModelProperty(value = "项目id", dataType = "String") + private String priceItem; + + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + + @TableField("price_standard") + @ExcelProperty(value = "依据标准",order = 9) + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandard; + + @TableField("price_limit") + @ApiModelProperty(value = "限制范围", dataType = "String") + private String priceLimit; + + @TableField("price_description") + @ApiModelProperty(value = "说明", dataType = "String") + private String priceDescription; + + @TableField("operator_discount_permission") + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") + private String operatorDiscountPermission; + + @TableField("director_discount_permission") + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") + private String directorDiscountPermission; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("model") + @ExcelProperty(value = "型号",order = 3) + @ApiModelProperty(value = "型号", dataType = "String") + private String model; + + @TableField("price") + @ExcelProperty(value = "标准价格(元)",order = 6) + @ApiModelProperty(value = "标准价格(元)", dataType = "Double") + private Double price; + + @TableField("create_time") + @ExcelProperty(value = "创建时间",order = 10) + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "历史价格列表", dataType = "List") + @TableField(exist = false) + private List historicalPriceList; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java new file mode 100644 index 0000000..03938ad --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java new file mode 100644 index 0000000..efc97ab --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java new file mode 100644 index 0000000..9862b85 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterStaff.java @@ -0,0 +1,141 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("meter_staff") +public class MeterStaff implements Serializable { + + private static final long serialVersionUID = 8221643116858985801L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + @ExcelProperty(value = "姓名",order = 1) + private String name; + + @TableField("minio_file_name") + @ApiModelProperty(value = "人员照片(调用上传文件接口,返回的文件id)", dataType = "String") + private String minioFileName; + + @TableField("id_card") + @ApiModelProperty(value = "身份证号", dataType = "String") + private String idCard; + + @TableField("staff_no") + @ApiModelProperty(value = "人员编号", dataType = "String") + @ExcelProperty(value = "人员编号",order = 0) + private String staffNo; + + @TableField("account") + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + + @TableField("sex") + @ApiModelProperty(value = "性别", dataType = "String") + @ExcelProperty(value = "性别",order = 3) + private String sex; + + @TableField("birthday") + @ApiModelProperty(value = "生日", dataType = "String") + private String birthday; + + @TableField("education") + @ApiModelProperty(value = "文化程度", dataType = "String") + @ExcelProperty(value = "学历",order = 2) + private String education; + + @TableField("technology_job") + @ApiModelProperty(value = "技术职位", dataType = "String") + @ExcelProperty(value = "技术职位",order = 5) + private String technologyJob; + + @TableField("administration_job") + @ApiModelProperty(value = "行政职务", dataType = "String") + @ExcelProperty(value = "行政职务",order = 6) + private String administrationJob; + + @TableField("dept_id") + @ApiModelProperty(value = "组织部门", dataType = "String") + @ExcelProperty(value = "工作部门",order = 4) + private String deptId; + + @TableField("major") + @ApiModelProperty(value = "专业", dataType = "String") + @ExcelProperty(value = "计量专业",order = 7) + private String major; + + @TableField("certificate_company") + @ApiModelProperty(value = "发证单位", dataType = "String") + private String certificateCompany; + + @TableField("verifier_certificate_no") + @ApiModelProperty(value = "证书号", dataType = "String") + @ExcelProperty(value = "证书号",order = 8) + private String verifierCertificateNo; + + @TableField("certificate_date") + @ApiModelProperty(value = "有效日期", dataType = "String") + @ExcelProperty(value = "证书有效日期",order = 9) + private String certificateDate; + + @TableField("work_date") + @ApiModelProperty(value = "从事日期", dataType = "String") + private String workDate; + + @TableField("technology_exam") + @ApiModelProperty(value = "技术考核", dataType = "String") + @ExcelProperty(value = "技术考核",order = 10) + private String technologyExam; + + @TableField(value = "main_examiner") + @ApiModelProperty(value = "是否主考人", dataType = "String") + private String mainExaminer; + + @TableField(value = "special_operator") + @ApiModelProperty(value = "是否特操人", dataType = "String") + private String specialOperator; + + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @TableField("is_del") + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @TableField("create_time") + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @TableField("update_time") + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; + + @ApiModelProperty(value = "证书列表", dataType = "List") + @TableField(exist = false) + private List certificateList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java new file mode 100644 index 0000000..7dad6fa --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -0,0 +1,336 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-溯源供方-溯源供方表(计量计量单位的设备的单位) + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_trace_supplier") +public class MeterTraceSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + private Long id; + + /** + * 溯源供方编号 + */ + @ExcelProperty("溯源供方编号") + @ApiModelProperty(value = "溯源供方编号（列表、更新接口参数）", dataType = "String") + @TableField("supplier_no") + private String supplierNo; + + /** + * 公司名称 + */ + @ExcelProperty("溯源供方名称") + @ApiModelProperty(value = "公司名称", dataType = "String", required = true) + @NotBlank(message = "公司名称不能为空") + @TableField("supplier_name") + private String supplierName; + + /** + * 公司简称 + */ + @ApiModelProperty(value = "公司简称", dataType = "String") + @TableField("brief_name") + private String briefName; + + /** + * 业务内容 + */ + @ExcelProperty("业务内容") + @ApiModelProperty(value = "业务内容", dataType = "String", required = true) + @NotBlank(message = "业务内容不能为空") + @TableField("business_content") + private String businessContent; + + /** + * 税号 + */ + @ApiModelProperty(value = "税号", dataType = "String") + @TableField("tax_number") + private String taxNumber; + + /** + * 银行账户名 + */ + @ApiModelProperty(value = "银行账户名", dataType = "String") + @TableField("bank_account") + private String bankAccount; + + /** + * 银行名称 + */ + @ApiModelProperty(value = "银行名称", dataType = "String") + @TableField("bank_name") + private String bankName; + + /** + * 银行账号 + */ + @ApiModelProperty(value = "银行账号", dataType = "String") + @TableField("bank_account_number") + private String bankAccountNumber; + + /** + * 邮编 + */ + @ApiModelProperty(value = "邮编", dataType = "String") + @TableField("postal_code") + private String postalCode; + + /** + * 负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人", dataType = "String") + @TableField("director") + private String director; + + /**发布人 + * 电话 + */ + @ExcelProperty("联系方式") + @ApiModelProperty(value = "电话", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 传真 + */ + @ApiModelProperty(value = "传真", dataType = "String") + @TableField("fax") + private String fax; + + /** + * 手机 + */ + @ApiModelProperty(value = "手机", dataType = "String") + @TableField("mobile") + private String mobile; + + /** + * 邮箱 + */ + @ApiModelProperty(value = "邮箱", dataType = "String") + @TableField("mailbox") + private String mailbox; + + /** + * 网址 + */ + @ApiModelProperty(value = "网址", dataType = "String") + @TableField("website") + private String website; + + /** + * 公司地址-国家 + */ + @ApiModelProperty(value = "公司地址-国家(code)", dataType = "String") + @TableField("company_country") + private String companyCountry; + + @ExcelProperty("公司地址-国家") + @ApiModelProperty(value = "公司地址-国家(名称)", dataType = "String") + @TableField("company_country_name") + private String companyCountryName; + + /** + * 公司地址-省 + */ + @ApiModelProperty(value = "公司地址-省(code)", dataType = "String") + @TableField("company_province") + private String companyProvince; + + @ExcelProperty("公司地址-省") + @ApiModelProperty(value = "公司地址-省(名称)", dataType = "String") + @TableField("company_province_name") + private String companyProvinceName; + + /** + * 公司地址-市 + */ + @ApiModelProperty(value = "公司地址-市(code)", dataType = "String") + @TableField("company_city") + private String companyCity; + + @ExcelProperty("公司地址-市") + @ApiModelProperty(value = "公司地址-市(名称)", dataType = "String") + @TableField("company_city_name") + private String companyCityName; + + /** + * 公司地址-区 + */ + @ApiModelProperty(value = "公司地址-区(code)", dataType = "String") + @TableField("company_area") + private String companyArea; + + @ExcelProperty("公司地址-区") + @ApiModelProperty(value = "公司地址-区(名称)", dataType = "String") + @TableField("company_area_name") + private String companyAreaName; + + /** + * 公司地址-详细地址 + */ + @ExcelProperty("公司地址-详细地址") + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + @TableField("company_address") + private String companyAddress; + + /** + * 开票地址-国家 + */ + @ApiModelProperty(value = "开票地址-国家(code)", dataType = "String") + @TableField("invoice_country") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-国家(名称)", dataType = "String") + @TableField("invoice_country_name") + private String invoiceCountryName; + + /** + * 开票地址-省 + */ + @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") + @TableField("invoice_province") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") + @TableField("invoice_province_name") + private String invoiceProvinceName; + + /** + * 开票地址-市 + */ + @ApiModelProperty(value = "开票地址-市(code)", dataType = "String") + @TableField("invoice_city") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-市(名称)", dataType = "String") + @TableField("invoice_city_name") + private String invoiceCityName; + + /** + * 开票地址-区 + */ + @ApiModelProperty(value = "开票地址-区(code)", dataType = "String") + @TableField("invoice_area") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-区(名称)", dataType = "String") + @TableField("invoice_area_name") + private String invoiceAreaName; + + /** + * 开票地址-详细地址 + */ + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + @TableField("invoice_address") + private String invoiceAddress; + + /** + * 公司业务范围 + */ + @ApiModelProperty(value = "公司业务范围", dataType = "String") + @TableField("business_scope") + private String businessScope; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id（未通过文件编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 登录者用户id（保证流程发起人为登录用户），接口中获取，工作流中使用 + */ + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @TableField(exist = false) + private List traceSupplierPersonList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java new file mode 100644 index 0000000..b21763c --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplierPerson.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-溯源供方-溯源供方人员表 + *

+ * + * @author wangpeng + * @since 2022-11-28 + */ +@ApiModel +@Data +@TableName("meter_trace_supplier_person") +public class MeterTraceSupplierPerson implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 溯源供方表id + */ + @ApiModelProperty(hidden = true) + @TableField("supplier_id") + private Long supplierId; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") + @TableField("person_no") + private String personNo; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名", dataType = "String") + @TableField("name") + private String name; + + /** + * 部门 + */ + @ApiModelProperty(value = "部门", dataType = "String") + @TableField("department") + private String department; + + /** + * 职务 + */ + @ApiModelProperty(value = "职务", dataType = "String") + @TableField("job") + private String job; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式", dataType = "String") + @TableField("phone") + private String phone; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java new file mode 100644 index 0000000..d1c3ec1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainLog.java @@ -0,0 +1,172 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训计录表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_log") +public class MeterTrainLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id", dataType = "Long") + private Long id; + + /** + * 培训计录编号 + */ + @ExcelProperty("记录编号") + @ApiModelProperty(value = "培训计录编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 培训名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "记录名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + + /** + * 填表人 + */ + @ApiModelProperty(value = "填表人", dataType = "String") + @TableField("preparer") + private String preparer; + + /** + * 培训计划表id + */ + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + @TableField("plan_id") + private Long planId; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "String") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训内容 + */ + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 培训效果 + */ + @ApiModelProperty(value = "培训效果", dataType = "String") + @TableField("train_effect") + private String trainEffect; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题", dataType = "String") + @TableField("problems") + private String problems; + + /** + * 改进措施 + */ + @ApiModelProperty(value = "改进措施", dataType = "String") + @TableField("improve_method") + private String improveMethod; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java new file mode 100644 index 0000000..ae324f0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -0,0 +1,197 @@ +package com.casic.missiles.model.meter; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 计量管理-培训管理-培训计划表 + *

+ * + * @author wangpeng + * @since 2022-11-23 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("meter_train_plan") +public class MeterTrainPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long", required = true) + private Long id; + + /** + * 培训计划编号 + */ + @ExcelProperty("计划编号") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @TableField("plan_no") + private String planNo; + + /** + * 培训计划名称 + */ + @ExcelProperty("培训名称") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) + @NotBlank(message = "培训名称不能为空") + @TableField("plan_name") + private String planName; + + /** + * 培训对象 + */ + @ExcelProperty("培训对象") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) + @NotBlank(message = "培训对象不能为空") + @TableField("train_person") + private String trainPerson; + + /** + * 培训人数 + */ + @ExcelProperty("培训人数") + @ApiModelProperty(value = "培训人数", dataType = "Integer") + @TableField("train_number") + private Integer trainNumber; + + /** + * 培训时间 + */ + @ExcelProperty("培训时间") + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField("train_time") + private String trainTime; + + /** + * 培训学时 + */ + @ExcelProperty("培训学时") + @ApiModelProperty(value = "培训学时", dataType = "String") + @TableField("train_hour") + private String trainHour; + + /** + * 组织部门id-系统组织表 + */ + @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") + @TableField("dept_id") + private Long deptId; + + @ExcelProperty("主管部门") + @ApiModelProperty(value = "主管部门(列表接口参数)", dataType = "String") + @TableField(exist = false) + private String deptName; + + /** + * 实施单位-手填 + */ + @ExcelProperty("实施单位") + @ApiModelProperty(value = "实施单位-手填", dataType = "String") + @TableField("effective_company") + private String effectiveCompany; + + /** + * 负责人-人员名字 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "负责人-人员名字", dataType = "String") + @TableField("director") + private String director; + + /** + * 培训地点 + */ + @ExcelProperty("培训地点") + @ApiModelProperty(value = "培训地点", dataType = "String") + @TableField("train_address") + private String trainAddress; + + /** + * 培训内容 + */ + @ExcelProperty("培训内容") + @ApiModelProperty(value = "培训内容", dataType = "String") + @TableField("train_content") + private String trainContent; + + /** + * 备注 + */ + @ExcelProperty("备注") + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 流程定义id + */ + @ApiModelProperty(value = "流程实例id（未通过培训计划编辑接口必传参数）", dataType = "String") + @TableField("process_id") + private String processId; + + /** + * 审批状态-字典code + */ + @ApiModelProperty(hidden = true) + @TableField("approval_status") + private String approvalStatus; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String approvalStatusName; + + @ApiModelProperty(hidden = true) + @TableField("create_user_id") + private Long createUserId; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @NotEmpty(message = "培训人员不能为空") + @ApiModelProperty(value = "培训人员", dataType = "List") + @TableField(exist = false) + private List trainStaffList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java new file mode 100644 index 0000000..b80b637 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.meter; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 计量管理-培训管理-培训人员表 + *

+ * + * @author wangpeng + * @since 2022-11-26 + */ +@ApiModel +@Data +@TableName("meter_train_staff") +public class MeterTrainStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 计量人员表id + */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + @TableField("staff_id") + private Long staffId; + + /** + * 培训计划表id + */ + @ApiModelProperty(hidden = true) + @TableField("plan_id") + private Long planId; + + /** + * 学员名称 + */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) + @TableField("name") + private String name; + + /** + * 单位名称-存文字 + */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") + @TableField("company") + private String company; + + /** + * 技术职称-存文字 + */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") + @TableField("technology_job") + private String technologyJob; + + /** + * 签到时间 + */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") + @TableField("sign_time") + private String signTime; + + /** + * 考核结果-存文字 + */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") + @TableField("exam_result") + private String examResult; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java new file mode 100644 index 0000000..d015fa8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFlowForm.java @@ -0,0 +1,77 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程定义表单表 + * 表单和流程定义为多对一关系 + * @author wangpeng + * @since 2022-12-12 + */ +@Data +@TableName("system_flow_form") +public class SystemFlowForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 表单id + */ + @TableField("form_id") + private String formId; + + /** + * 流程定义部署表主键 + */ + @TableField("deploy_id") + private String deployId; + + /** + * 流程定义表主键 + */ + @TableField("pro_def_id") + private String procDefId; + + /** + * 表单名称 + */ + @TableField("form_name") + private String formName; + + /** + * 表单内容 + */ + @TableField("form_content") + private String formContent; + + /** + * 流程定义json + */ + @TableField("flow_def") + private String flowDef; + + /** + * 表单描述/流程定义描述 + */ + @TableField("form_desc") + private String formDesc; + + @TableField("is_del") + private Integer isDel; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java new file mode 100644 index 0000000..560fdb2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java @@ -0,0 +1,115 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + *

+ * 系统管理-通知公告表 + *

+ * + * @author wangpeng + * @since 2022-11-29 + */ +@ApiModel +@Data +@TableName("system_notice") +public class SystemNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id（列表接口参数）", dataType = "Long") + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 通知公告编号 + */ + @ApiModelProperty(value = "通知公告编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("notice_no") + private String noticeNo; + + /** + * 通知公告标题 + */ + @ApiModelProperty(value = "通知公告标题", dataType = "String") + @NotBlank(message = "标题不能为空") + @TableField("notice_title") + private String noticeTitle; + + /** + * 发布人 + */ + @ApiModelProperty(value = "发布人", dataType = "String") + @NotBlank(message = "发布人不能为空") + @TableField("notice_publisher") + private String noticePublisher; + + /** + * 发布单位 + */ + @ApiModelProperty(value = "发布单位", dataType = "String") + @TableField("notice_company") + private String noticeCompany; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间", dataType = "String") + @TableField("notice_time") + private String noticeTime; + + /** + * 内容简述 + */ + @ApiModelProperty(value = "内容简述", dataType = "String") + @TableField("notice_sketch") + private String noticeSketch; + + /** + * 发布内容 + */ + @ApiModelProperty(value = "发布内容", dataType = "String") + @NotBlank(message = "发布内容不能为空") + @TableField("notice_content") + private String noticeContent; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回名称", dataType = "String") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java new file mode 100644 index 0000000..674b4a0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -0,0 +1,126 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-签章/签名管理表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_sign") +public class SystemSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 签章/签名编号 + */ + @ExcelProperty("编号") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("sign_no") + private String signNo; + + /** + * 签章/签名名称 + */ + @ExcelProperty("名称") + @ApiModelProperty(value = "签章/签名编号", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("sign_name") + private String signName; + + /** + * 签章/签名描述 + */ + @ExcelProperty("描述") + @ApiModelProperty(value = "签章/签名描述", dataType = "String") + @TableField("sign_desc") + private String signDesc; + + /** + * 签章/签名负责人 + */ + @ExcelProperty("负责人") + @ApiModelProperty(value = "签章/签名负责人", dataType = "String") + @NotBlank(message = "负责人不能为空") + @TableField("sign_director") + private String signDirector; + + /** + * 签章或签名-字典code + */ + @ApiModelProperty(value = "签章/签名-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("sign_type") + private String signType; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java new file mode 100644 index 0000000..762334a --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSignUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 签章/签名与用户关联表(签章/签名可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_sign_user_relation") +public class SystemSignUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 签章/签名表id + */ + @TableField("sign_id") + private Long signId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java new file mode 100644 index 0000000..f808739 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.system; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 系统管理-常用工具-原始记录模板/证书报告模板表 + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@ApiModel +@Data +@TableName("system_template") +public class SystemTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + @NotNull(message = "主键id不能为空") + @TableId("id") + private Long id; + + /** + * 模板编号 + */ + @ExcelProperty("模板编号") + @ApiModelProperty(value = "原始记录模板/证书报告模板编号", dataType = "String") + @NotBlank(message = "编号不能为空") + @TableField("template_no") + private String templateNo; + + /** + * 模板名称 + */ + @ExcelProperty("模板名称") + @ApiModelProperty(value = "原始记录模板/证书报告模板表名称", dataType = "String") + @NotBlank(message = "名称不能为空") + @TableField("template_name") + private String templateName; + + /** + * 原始记录模板或证书报告模板-字典code + */ + @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String") + @NotBlank(message = "类型不能为空") + @TableField("template_type") + private String templateType; + + /** + * 模板描述 + */ + @ExcelProperty("模板描述") + @ApiModelProperty(value = "原始记录模板/证书报告模板描述", dataType = "String") + @TableField("template_desc") + private String templateDesc; + + /** + * 模板创建人 + */ + @ExcelProperty("模板创建人") + @ApiModelProperty(value = "原始记录模板/证书报告模板创建人", dataType = "String") + @NotBlank(message = "创建人不能为空") + @TableField("template_creator") + private String templateCreator; + + /** + * minio存储文件名 + */ + @ApiModelProperty(value = "上传文件返回文件名", dataType = "String") + @NotBlank(message = "文件不能为空") + @TableField("minio_file_name") + private String minioFileName; + + /** + * 删除标记 + */ + @ApiModelProperty(hidden = true) + @TableField("is_del") + private Integer isDel; + + /** + * 创建时间 + */ + @ExcelProperty("创建时间") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @NotEmpty(message = "可使用人不能为空") + @TableField(exist = false) + private List userIdList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java new file mode 100644 index 0000000..8ae6a65 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplateUserRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 原始记录/证书报告模板与用户关联表(原始记录/证书报告模板可使用人) + *

+ * + * @author wangpeng + * @since 2022-12-01 + */ +@Data +@TableName("system_template_user_relation") +public class SystemTemplateUserRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录/证书报告模板表id + */ + @TableField("template_id") + private Long templateId; + + /** + * 系统用户表id + */ + @TableField("user_id") + private Long userId; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java new file mode 100644 index 0000000..bb6bc87 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/UserInfo.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.system; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + @TableField("dept_id") + @ApiModelProperty(value = "部门id", dataType = "String") + private String deptId; + + @TableField(exist = false) + @ApiModelProperty(value = "部门名称", dataType = "String") + private String deptName; + + @TableField("name") + @ApiModelProperty(value = "姓名", dataType = "String") + private String name; + + @TableField("account") + @ApiModelProperty(value = "账户", dataType = "String") + private String account; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index bf83b75..e02ddc0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.system.ISystemFlowFormService; import lombok.extern.slf4j.Slf4j; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index 82b3063..7f81a8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentUserMapper; -import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 4469286..b51ba91 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -10,7 +10,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardVerifyRegulationMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java index c71a751..383e343 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateExpireMessageServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 2d244e8..9159410 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -21,8 +21,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper; import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.*; -import com.casic.missiles.modular.system.dao.DeptMapper; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.meter.MeterCertificateExpireMessageService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.utils.ExportUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index a0b1046..fc18af3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -22,7 +22,7 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterFileMapper; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java index 62e8d42..67859cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterHistoricalPriceServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterHistoricalPriceMapper; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; import com.casic.missiles.service.meter.MeterHistoricalPriceService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index 4ce9c35..34c92ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -13,7 +13,7 @@ import com.casic.missiles.enums.MeterDeptTypeEnum; import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.meter.IMeterOrganizeService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 0fc9b4b..393696e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.service.Impl.meter; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,15 +17,14 @@ import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; -import com.casic.missiles.model.*; +import com.casic.missiles.model.meter.MeterPrice; +import com.casic.missiles.model.meter.MeterPriceCategory; +import com.casic.missiles.model.meter.MeterPriceItem; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.service.meter.MeterHistoricalPriceService; import com.casic.missiles.service.meter.MeterPriceService; import com.casic.missiles.utils.ExportUtils; import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 106307d..e4d5cb9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -19,9 +19,9 @@ import com.casic.missiles.mapper.meter.MeterCertificateMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.sys.UserInfoMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java index a51251c..18900d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierPersonServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTraceSupplierPersonMapper; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.service.meter.IMeterTraceSupplierPersonService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index e7720f8..2889804 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; -import com.casic.missiles.model.MeterTraceSupplier; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.flowable.ApprovalOperateService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java index 2937afb..2a79b51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainLogServiceImpl.java @@ -11,7 +11,7 @@ import com.casic.missiles.dto.meter.TrainLogUpdateRequest; import com.casic.missiles.mapper.meter.MeterTrainLogMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import com.casic.missiles.service.meter.IMeterTrainLogService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index cbc5d52..0ca57db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -18,8 +18,8 @@ import com.casic.missiles.enums.MeterDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; -import com.casic.missiles.model.MeterTrainPlan; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java index deb8d43..2bd4ded 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainStaffServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.service.meter.IMeterTrainStaffService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java index 2685eec..1acb86b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java @@ -16,17 +16,14 @@ import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.meter.MeterTrainStaffMapper; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.modular.system.dao.RuRelationMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.meter.MeterWorkbenchService; -import com.sun.jna.platform.win32.OaIdl; -import javafx.scene.effect.MotionBlur; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index fb925f4..265d989 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -14,7 +14,7 @@ import com.casic.missiles.dto.system.FlowUpdateStateRequest; import com.casic.missiles.mapper.system.FlowDefMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.RuRelation; import com.casic.missiles.modular.system.model.User; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java index a5f7e6a..1d97a16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemFlowFormServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.mapper.system.SystemFlowFormMapper; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.Dept; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java index b29c655..08b23c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemNoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; import com.casic.missiles.mapper.system.SystemNoticeMapper; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; import com.casic.missiles.service.system.ISystemNoticeService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index ed2d861..083072e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.mapper.system.SystemSignMapper; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSign; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSign; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java index 8cf01e6..d366061 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemSignUserRelationMapper; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; import com.casic.missiles.service.system.ISystemSignUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java index 41fff8f..ec836f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java @@ -10,8 +10,8 @@ import com.casic.missiles.dto.system.TemplateListRequest; import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplate; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateService; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import com.casic.missiles.utils.ConvertUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java index 67eac5d..315f0a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateUserRelationServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.system.SystemTemplateUserRelationMapper; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; import com.casic.missiles.service.system.ISystemTemplateUserRelationService; import org.springframework.stereotype.Service; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java index a36ae80..5e6ed0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFileService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterFile; +import com.casic.missiles.model.meter.MeterFile; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java index 625dc21..dd9ac4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.meter.OrganizeListRequest; import com.casic.missiles.dto.meter.ParentDeptRequest; import com.casic.missiles.dto.meter.ParentDeptResponse; -import com.casic.missiles.model.MeterOrganize; +import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.modular.system.model.Dept; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java index a1d4465..180a47d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierPersonService.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTraceSupplierPerson; +import com.casic.missiles.model.meter.MeterTraceSupplierPerson; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java index 2d7de64..c0617fe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTraceSupplierService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTraceSupplier; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java index 5836ebc..4bfea32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainLogService.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.meter.TrainLogDetailResponse; import com.casic.missiles.dto.meter.TrainLogListRequest; import com.casic.missiles.dto.meter.TrainLogUpdateRequest; -import com.casic.missiles.model.MeterTrainLog; +import com.casic.missiles.model.meter.MeterTrainLog; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java index 5043880..74dae78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.dto.meter.*; -import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.meter.MeterTrainPlan; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java index ced9137..d51eac4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainStaffService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterTrainStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java index e28f5d4..edd51f1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateExpireMessageService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; public interface MeterCertificateExpireMessageService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java index e588de4..5fce202 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterCertificateService.java @@ -7,8 +7,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterCertificateImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterCertificate; -import com.casic.missiles.model.MeterCertificateExpireMessage; +import com.casic.missiles.model.meter.MeterCertificate; +import com.casic.missiles.model.meter.MeterCertificateExpireMessage; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java index 507e268..9123e24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterHistoricalPriceService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.meter; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.MeterHistoricalPrice; +import com.casic.missiles.model.meter.MeterHistoricalPrice; public interface MeterHistoricalPriceService extends IService { } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 617a7f1..1a8f12c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterPriceImport; import com.casic.missiles.dto.meter.MeterPriceRequest; -import com.casic.missiles.model.MeterPrice; +import com.casic.missiles.model.meter.MeterPrice; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 86fa332..c630322 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -6,9 +6,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; -import com.casic.missiles.model.MeterStaff; -import com.casic.missiles.model.UserInfo; -import org.springframework.web.multipart.MultipartFile; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java index 70d391b..80ec612 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemFlowForm; +import com.casic.missiles.model.system.SystemFlowForm; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java index b329ccd..4d5ffe3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java @@ -5,7 +5,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.system.NoticeAddRequest; import com.casic.missiles.dto.system.NoticeListRequest; -import com.casic.missiles.model.SystemNotice; +import com.casic.missiles.model.system.SystemNotice; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java index 78f6e9e..c83b68c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.system.SignAddRequest; import com.casic.missiles.dto.system.SignDetailResponse; import com.casic.missiles.dto.system.SignListRequest; -import com.casic.missiles.model.SystemSign; +import com.casic.missiles.model.system.SystemSign; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java index 54e4a40..91aa01e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignUserRelationService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemSignUserRelation; +import com.casic.missiles.model.system.SystemSignUserRelation; /** *

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java index 09883b9..01d93bf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.system.TemplateAddRequest; import com.casic.missiles.dto.system.TemplateDetailResponse; import com.casic.missiles.dto.system.TemplateListRequest; -import com.casic.missiles.model.SystemTemplate; +import com.casic.missiles.model.system.SystemTemplate; import java.util.List; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateUserRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateUserRelationService.java index d36a2c3..07dbe23 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateUserRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemTemplateUserRelationService.java @@ -1,7 +1,7 @@ package com.casic.missiles.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.SystemTemplateUserRelation; +import com.casic.missiles.model.system.SystemTemplateUserRelation; /** *